Changeset 1846

Timestamp:

10/07/2010 11:52:59 AM (20 months ago)

Author:

Xiping.Wang

Message:

[omcollab_ui]sync from trunk

Location:

branches/omcollab_ui

Files:

• . (modified) (1 prop)
• _InstallationResources (modified) (1 prop)
• _InstallationResources/omwiki_migration_14000_14002.sql (copied) (copied from trunk/_InstallationResources/omwiki_migration_14000_14002.sql)
• blogs (modified) (1 prop)
• blogs/wp-content/themes/mike2 (modified) (1 prop)
• home (modified) (1 prop)
• home/mylinks.php (modified) (1 prop)
• w (modified) (1 prop)
• w/LocalSettings.php (modified) (1 diff)
• w/extensions/DataDrivenLinks/DataDrivenLinks.php (modified) (1 diff)

branches/omcollab_ui/w/LocalSettings.php

@@ -144 +144 @@
 $wgGroupPermissions['*']['createaccount']          = true;
 $wgGroupPermissions['*']['read']                   = true;
-$wgGroupPermissions['Core Contributor']['protect'] = true;
+
+# xiping.wang at gmail.com - 2010-08-31 - Remove space from group name 
+# http://stackoverflow.com/questions/1104299/adding-users-to-a-custom-group-in-mediawiki
+$wgGroupPermissions['CoreContributor']['protect'] = true;
 $wgGroupPermissions['sysop']['editwidgets']        = true;
 $wgSysopUserBans                                   = true;

branches/omcollab_ui/w/extensions/DataDrivenLinks/DataDrivenLinks.php

@@ -66 +66 @@
         $page = $this->dbr->tableName( 'page' );
         // Get all possible articles and categories
-        $res = $this->dbr->query("SELECT * FROM $om_categorylinks WHERE cl_to in (SELECT cl_to FROM $om_categorylinks WHERE cl_sortkey = '" . $this->articleOBJ->mTextform . "') AND cl_sortkey <> '" . $this->articleOBJ->mTextform . "' ORDER BY cl_sortkey");
+        $res = $this->dbr->query("SELECT * FROM $om_categorylinks WHERE cl_to in (SELECT cl_to FROM $om_categorylinks WHERE cl_sortkey = '" . mysql_real_escape_string($this->articleOBJ->mTextform) . "') AND cl_sortkey <> '" . mysql_real_escape_string($this->articleOBJ->mTextform) . "' ORDER BY cl_sortkey");
         //echo "SELECT * FROM $om_categorylinks WHERE cl_to in (SELECT cl_to FROM $om_categorylinks WHERE cl_sortkey = '" . $this->articleOBJ->mTextform . "') AND cl_sortkey > '" . $this->articleOBJ->mTextform . "' ORDER BY cl_sortkey";
         while( $row = $this->dbr->fetchObject( $res ) ) { // Filter to extract only articles
-            $temp = str_replace(" ", "_", strtolower($row->cl_sortkey)); // temp string to make the string to page_title style
+            $temp = mysql_real_escape_string(str_replace(" ", "_", strtolower($row->cl_sortkey))); // temp string to make the string to page_title style
             
             // Get data from page table by using $temp to know if it is a category or article