Merged

[quix0rs-gnu-social.git] / plugins / TwitterBridge / scripts / initialize_notice_to_status.php

diff --git a/plugins/TwitterBridge/scripts/initialize_notice_to_status.php b/plugins/TwitterBridge/scripts/initialize_notice_to_status.php
old mode 100644 (file)
new mode 100755 (executable)
index d1acfd5..12fb245
--- a/plugins/TwitterBridge/scripts/initialize_notice_to_status.php
+++ b/plugins/TwitterBridge/scripts/initialize_notice_to_status.php
@@ -29,7 +29,7 @@ version 0.9.5.
 
 ENDOFHELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 // We update any notices that may have come in from
 // Twitter that we don't have a status_id for. Note that
@@ -44,7 +44,7 @@ $n->query('SELECT notice.id, notice.uri ' .
           'AND notice_to_status.status_id IS NULL');
 
 while ($n->fetch()) {
-    if (preg_match('#^http://twitter.com/[\w_.]+/status/(\d+)$#', $n->uri, $match)) {
+    if (preg_match('/^http://twitter.com(/#!)?/[\w_.]+/status/(\d+)$/', $n->uri, $match)) {
         $status_id = $match[1];
         Notice_to_status::saveNew($n->id, $status_id);
     }